diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index 5108afa..826bcce 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -952,12 +952,17 @@
 	{
 		global $mimes;
 
-		if (count($this->mimes) === 0)
+		if (count($this->mimes) == 0)
 		{
-			load_environ_config('mimes');
-
-			// Return FALSE if we still have no mimes after trying to load them up.
-			if (count($this->mimes) === 0)
+			if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/mimes.php'))
+			{
+				include(APPPATH.'config/'.ENVIRONMENT.'/mimes.php');
+			}
+			elseif (is_file(APPPATH.'config/mimes.php'))
+			{
+				include(APPPATH.'config//mimes.php');
+			}
+			else
 			{
 				return FALSE;
 			}
diff --git a/system/libraries/User_agent.php b/system/libraries/User_agent.php
index 5288525..c31ff26 100644
--- a/system/libraries/User_agent.php
+++ b/system/libraries/User_agent.php
@@ -94,10 +94,15 @@
 	 */
 	protected function _load_agent_file()
 	{
-		load_environ_config('user_agents');
-
-		// Return FALSE if we still have no mimes after trying to load them up.
-		if (count($this->mimes) === 0)
+		if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/user_agents.php'))
+		{
+			include(APPPATH.'config/'.ENVIRONMENT.'/user_agents.php');
+		}
+		elseif (is_file(APPPATH.'config/user_agents.php'))
+		{
+			include(APPPATH.'config/user_agents.php');
+		}
+		else
 		{
 			return FALSE;
 		}